Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Oct 24, 2011
  1. Junio C Hamano

    Merge branch 'maint-1.7.3' into maint

    gitster authored
    * maint-1.7.3:
      Reindent closing bracket using tab instead of spaces
Commits on Aug 29, 2011
  1. Junio C Hamano

    Merge branch 'jk/color-and-pager'

    gitster authored
    * jk/color-and-pager:
      want_color: automatically fallback to color.ui
      diff: don't load color config in plumbing
      config: refactor get_colorbool function
      color: delay auto-color decision until point of use
      git_config_colorbool: refactor stdout_is_tty handling
      diff: refactor COLOR_DIFF from a flag into an int
      setup_pager: set GIT_PAGER_IN_USE
      t7006: use test_config helpers
      test-lib: add helper functions for config
      t7006: modernize calls to unset
    
    Conflicts:
    	builtin/commit.c
    	parse-options.c
Commits on Jun 30, 2011
  1. Junio C Hamano

    Merge branch 'jk/maint-1.7.2-status-ignored'

    gitster authored
    * jk/maint-1.7.2-status-ignored:
      git status --ignored: tests and docs
      status: fix bug with missing --ignore files
    
    Conflicts:
    	Documentation/git-status.txt
    	t/t7508-status.sh
Commits on Apr 2, 2011
  1. Junio C Hamano

    Merge branch 'ab/i18n-st'

    gitster authored
    * ab/i18n-st: (69 commits)
      i18n: git-shortlog basic messages
      i18n: git-revert split up "could not revert/apply" message
      i18n: git-revert literal "me" messages
      i18n: git-revert "Your local changes" message
      i18n: git-revert basic messages
      i18n: git-notes GIT_NOTES_REWRITE_MODE error message
      i18n: git-notes basic commands
      i18n: git-gc "Auto packing the repository" message
      i18n: git-gc basic messages
      i18n: git-describe basic messages
      i18n: git-clean clean.requireForce messages
      i18n: git-clean basic messages
      i18n: git-bundle basic messages
      i18n: git-archive basic messages
      i18n: git-status "renamed: " message
      i18n: git-status "Initial commit" message
      i18n: git-status "Changes to be committed" message
      i18n: git-status shortstatus messages
      i18n: git-status "nothing to commit" messages
      i18n: git-status basic messages
      ...
    
    Conflicts:
    	builtin/branch.c
    	builtin/checkout.c
    	builtin/clone.c
    	builtin/commit.c
    	builtin/grep.c
    	builtin/merge.c
    	builtin/push.c
    	builtin/revert.c
    	t/t3507-cherry-pick-conflict.sh
    	t/t7607-merge-overwrite.sh
Commits on Mar 20, 2011
  1. Junio C Hamano

    Merge branch 'jn/status-translatable'

    gitster authored
    * jn/status-translatable:
      commit, status: use status_printf{,_ln,_more} helpers
      commit: refer to commit template as s->fp
      wt-status: add helpers for printing wt-status lines
    
    Conflicts:
    	builtin/commit.c
Commits on Mar 9, 2011
  1. Junio C Hamano

    Merge branch 'js/cherry-pick-usability'

    gitster authored
    * js/cherry-pick-usability:
      Teach commit about CHERRY_PICK_HEAD
      bash: teach __git_ps1 about CHERRY_PICK_HEAD
      Introduce CHERRY_PICK_HEAD
      t3507: introduce pristine-detach helper
Commits on Dec 16, 2010
  1. Junio C Hamano

    Merge branch 'aa/status-hilite-branch'

    gitster authored
    * aa/status-hilite-branch:
      default color.status.branch to "same as header"
      status: show branchname with a configurable color
Commits on Dec 4, 2010
  1. Junio C Hamano

    Merge branch 'kb/maint-status-cquote'

    gitster authored
    * kb/maint-status-cquote:
      status: Quote paths with spaces in short format
Commits on Jun 30, 2010
  1. Junio C Hamano

    Merge branch 'jl/status-ignore-submodules'

    gitster authored
    * jl/status-ignore-submodules:
      Add the option "--ignore-submodules" to "git status"
      git submodule: ignore dirty submodules for summary and status
    
    Conflicts:
    	builtin/commit.c
    	t/t7508-status.sh
    	wt-status.c
    	wt-status.h
  2. Junio C Hamano

    Merge branch 'jp/string-list-api-cleanup'

    gitster authored
    * jp/string-list-api-cleanup:
      string_list: Fix argument order for string_list_append
      string_list: Fix argument order for string_list_lookup
      string_list: Fix argument order for string_list_insert_at_index
      string_list: Fix argument order for string_list_insert
      string_list: Fix argument order for for_each_string_list
      string_list: Fix argument order for print_string_list
Commits on Jun 21, 2010
  1. Junio C Hamano

    Merge branch 'gv/portable'

    gitster authored
    * gv/portable:
      test-lib: use DIFF definition from GIT-BUILD-OPTIONS
      build: propagate $DIFF to scripts
      Makefile: Tru64 portability fix
      Makefile: HP-UX 10.20 portability fixes
      Makefile: HPUX11 portability fixes
      Makefile: SunOS 5.6 portability fix
      inline declaration does not work on AIX
      Allow disabling "inline"
      Some platforms lack socklen_t type
      Make NO_{INET_NTOP,INET_PTON} configured independently
      Makefile: some platforms do not have hstrerror anywhere
      git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
      test_cmp: do not use "diff -u" on platforms that lack one
      fixup: do not unconditionally disable "diff -u"
      tests: use "test_cmp", not "diff", when verifying the result
      Do not use "diff" found on PATH while building and installing
      enums: omit trailing comma for portability
      Makefile: -lpthread may still be necessary when libc has only pthread stubs
      Rewrite dynamic structure initializations to runtime assignment
      Makefile: pass CPPFLAGS through to fllow customization
    
    Conflicts:
    	Makefile
    	wt-status.h
Commits on May 21, 2010
  1. Junio C Hamano

    Merge branch 'mg/advice-statushints'

    gitster authored
    * mg/advice-statushints:
      wt-status: take advice.statusHints seriously
      t7508: test advice.statusHints
    
    Conflicts:
    	wt-status.c
Commits on May 2, 2010
  1. Junio C Hamano

    wt-status: fix 'fprintf' compilation warning

    gitster authored
    color_fprintf() has the same function signature as fprintf() and newer
    gcc warns when a non-constant string is fed as the format
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 10, 2010
  1. Junio C Hamano

    status: --ignored option shows ignored files

    gitster authored
    There is no stronger reason behind the choice of "!!" than just I happened
    to have typed them.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Junio C Hamano

    wt-status: rename and restructure status-print-untracked

    gitster authored
    I will be reusing this to show ignored stuff in the next patch.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Junio C Hamano

    wt-status: collect ignored files

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Junio C Hamano

    wt-status: plug memory leak while collecting untracked files

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Junio C Hamano

    wt-status: remove unused workdir_untracked member

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 24, 2010
  1. Junio C Hamano

    Merge branch 'jl/submodule-diff-dirtiness'

    gitster authored
    * jl/submodule-diff-dirtiness:
      git status: ignoring untracked files must apply to submodules too
      git status: Fix false positive "new commits" output for dirty submodules
      Refactor dirty submodule detection in diff-lib.c
      git status: Show detailed dirty status of submodules in long format
      git diff --submodule: Show detailed dirty status of submodules
Commits on Mar 9, 2010
  1. Junio C Hamano

    revision: introduce setup_revision_opt

    gitster authored
    So far the last parameter to setup_revisions() was to specify the default
    ref when the command line did not give any (typically "HEAD").  This changes
    it to take a pointer to a structure so that we can add other information without
    touching too many codepaths in later patches.
    
    There is no functionality change.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 23, 2010
  1. Junio C Hamano

    Merge branch 'jl/submodule-diff'

    gitster authored
    * jl/submodule-diff:
      Performance optimization for detection of modified submodules
      git status: Show uncommitted submodule changes too when enabled
      Teach diff that modified submodule directory is dirty
      Show submodules as modified when they contain a dirty work tree
Commits on Dec 28, 2009
  1. Junio C Hamano

    Merge branch 'jk/1.7.0-status'

    gitster authored
    * jk/1.7.0-status:
      status/commit: do not suggest "reset HEAD <path>" while merging
      commit/status: "git add <path>" is not necessarily how to resolve
      commit/status: check $GIT_DIR/MERGE_HEAD only once
      t7508-status: test all modes with color
      t7508-status: status --porcelain ignores relative paths setting
      status: reduce duplicated setup code
      status: disable color for porcelain format
      status -s: obey color.status
      builtin-commit: refactor short-status code into wt-status.c
      t7508-status.sh: Add tests for status -s
      status -s: respect the status.relativePaths option
      docs: note that status configuration affects only long format
      commit: support alternate status formats
      status: add --porcelain output format
      status: refactor format option parsing
      status: refactor short-mode printing to its own function
      status: typo fix in usage
      git status: not "commit --dry-run" anymore
      git stat -s: short status output
      git stat: the beginning of "status that is not a dry-run of commit"
    
    Conflicts:
    	t/t4034-diff-words.sh
    	wt-status.c
Commits on Dec 12, 2009
  1. Junio C Hamano

    status/commit: do not suggest "reset HEAD <path>" while merging

    gitster authored
    Suggesting "'reset HEAD <path>' to unstage" is dead wrong if we are about
    to record a merge commit.  For either an unmerged path (i.e. with
    unresolved conflicts), or an updated path, it would result in discarding
    what the other branch did.
    
    Note that we do not do anything special in a case where we are amending a
    merge.  The user is making an evil merge starting from an already
    committed merge, and running "reset HEAD <path>" is the right way to get
    rid of the local edit that has been added to the index.
    
    Once "reset --unresolve <path>" becomes available, we might want to
    suggest it for a merged path that has unresolve information, but until
    then, just remove the incorrect advice.
    
    We might also want to suggest "checkout --conflict <path>" to revert the
    file in the work tree to the state of failed automerge for an unmerged
    path, but we never did that, and this commit does not change that.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Junio C Hamano

    commit/status: "git add <path>" is not necessarily how to resolve

    gitster authored
    When the desired resolution is to remove the path, "git rm <path>" is the
    command the user needs to use.  Just like in "Changed but not updated"
    section, suggest to use "git add/rm" as appropriate.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 22, 2009
  1. Junio C Hamano

    git stat: the beginning of "status that is not a dry-run of commit"

    gitster authored
    Tentatively add "git stat" as a new command.
    
    This is not "preview of commit with the same arguments"; the path parameters
    are not paths to be added to the pristine index (aka "--only" option), but
    are taken as pathspecs to limit the output.  Later in 1.7.0 release, it will
    take over "git status".
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 10, 2009
  1. Junio C Hamano

    wt-status: collect untracked files in a separate "collect" phase

    gitster authored
    In a way similar to updated and locally modified files are collected.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Junio C Hamano

    Make git_status_config() file scope static to builtin-commit.c

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Junio C Hamano

    wt-status: move wt_status_colors[] into wt_status structure

    gitster authored
    The benefit of this one alone is somewhat iffy, but for completeness this
    moves the wt_status_colors[] color palette to the wt_status structure to
    complete the libification started by the previous commit.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Junio C Hamano

    wt-status: move many global settings to wt_status structure

    gitster authored
    Turn four global variables (wt_status_use_color, show_tracked_files,
    wt_status_relative_paths, and wt_status_submodule_summary) into fields of
    wt_status structure.  They can also lose "wt_status_" prefix.
    
    Get rid of "untracked" field that was used only to keep track of otherwise
    available information redundantly.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 7, 2009
  1. Junio C Hamano

    status: show worktree status of conflicted paths separately

    gitster authored
    When a path is unmerged in the index, we used to always say "unmerged" in
    the "Changed but not updated" section, even when the path was deleted in
    the work tree.
    
    Remove unmerged entries from the "Updated" section, and create a new
    section "Unmerged paths".  Describe how the different stages conflict
    in more detail in this new section.
    
    Note that with the current 3-way merge policy (with or without recursive),
    certain combinations of index stages should never happen.  For example,
    having only stage #2 means that a path that did not exist in the common
    ancestor was added by us while the other branch did not do anything to it,
    which would have autoresolved to take our addition.  The code nevertheless
    prepares for the possibility that future merge policies may leave a path
    in such a state.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 6, 2009
  1. Junio C Hamano

    wt-status.c: rework the way changes to the index and work tree are su…

    gitster authored
    …mmarized
    
    Introduce a new infrastructure to find and summarize changes in a single
    string list, and rewrite wt_status_print_{updated,changed} functions using
    it.
    
    The goal of this change is to give more information on conflicted paths in
    the status output.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 20, 2009
  1. Junio C Hamano

    Merge branch 'mv/parseopt-ls-files'

    gitster authored
    * mv/parseopt-ls-files:
      ls-files: fix broken --no-empty-directory
      t3000: use test_cmp instead of diff
      parse-opt: migrate builtin-ls-files.
      Turn the flags in struct dir_struct into a single variable
    
    Conflicts:
    	builtin-ls-files.c
    	t/t3000-ls-files-others.sh
Commits on Nov 16, 2008
  1. Junio C Hamano

    Merge branch 'jk/commit-v-strip'

    gitster authored
    * jk/commit-v-strip:
      status: show "-v" diff even for initial commit
      wt-status: refactor initial commit printing
      define empty tree sha1 as a macro
Commits on Oct 17, 2008
  1. Junio C Hamano

    Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other

    gitster authored
    * jk/maint-ls-files-other:
      refactor handling of "other" files in ls-files and status
    
    Conflicts:
    	read-cache.c
Commits on Jul 13, 2008
  1. Junio C Hamano

    Merge branch 'jc/report-tracking'

    gitster authored
    * jc/report-tracking:
      branch -r -v: do not spit out garbage
      stat_tracking_info(): clear object flags used during counting
      git-branch -v: show the remote tracking statistics
      git-status: show the remote tracking statistics
      Refactor "tracking statistics" code used by "git checkout"
Something went wrong with that request. Please try again.