| 2010-03-21 | merge-recursive: add a label for ancestor Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | cherry-pick, revert: add a label for ancestor Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | revert: clarify label on conflict hunks Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | compat: add mempcpy() Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | checkout -m --conflict=diff3: add a label for ancestor Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | merge_trees(): add ancestor label parameter for diff3... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | merge_file(): add comment explaining behavior wrt conflict... Signed-off-by: Jonathan Nieder <jrnieder@mgila.com> |
diff | tree |
| 2010-03-21 | checkout --conflict=diff3: add a label for ancestor Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | ll_merge(): add ancestor label parameter for diff3... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | merge-file --diff3: add a label for ancestor Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | xdl_merge(): move file1 and file2 labels to xmparam... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | xdl_merge(): add optional ancestor label to diff3-style... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | tests: document cherry-pick behavior in face of conflicts Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | tests: document format of conflicts from checkout -m Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-20 | Makefile: Fix occasional GIT-CFLAGS breakage Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-20 | Makefile: Fix CDPATH problem Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-28 | Makefile: clarify definition of TEST_OBJS Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-23 | am: remove rebase-apply directory before gc Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-22 | tests: Fix race condition in t7006-pager Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-21 | t7006-pager: if stdout is not a terminal, make a new one Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-20 | tests: Add tests for automatic use of pager Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-15 | am: Fix launching of pager Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-15 | git svn: Fix launching of pager Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-15 | git.1: Clarify the behavior of the --paginate option Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-15 | Make 'git var GIT_PAGER' always print the configured... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-15 | Fix 'git var' usage synopsis Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-31 | Makefile: always remove .depend directories on 'make... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-31 | Makefile: tuck away generated makefile fragments in... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-31 | Do not install shell libraries executable Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-27 | Teach Makefile to check header dependencies Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-27 | Makefile: list standalone program object files in PROGRAM_OBJS Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-26 | Makefile: lazily compute header dependencies Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-26 | Makefile: list generated object files in OBJECTS Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-26 | Makefile: disable default implicit rules Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-26 | Makefile: rearrange dependency rules Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-26 | Makefile: transport.o depends on branch.h now Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-26 | Merge branch 'master' of git://repo.or.cz/alt-git into... |
diff | tree |
| 2010-01-26 | Makefile: drop dependency on $(wildcard */*.h) Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-26 | Makefile: clean up http-walker.o dependency rules Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-26 | Makefile: remove wt-status.h from LIB_H Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-26 | Makefile: make sure test helpers are rebuilt when headers... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-26 | Makefile: add missing header file dependencies Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-24 | Documentation: merge: use MERGE_HEAD to refer to the... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-24 | Documentation: simplify How Merge Works Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-24 | Documentation: merge: add a section about fast-forward Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-24 | Documentation: emphasize when git merge terminates... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-24 | Documentation: merge: add an overview Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-24 | Documentation: merge: move merge strategy list to end Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-24 | Documentation: suggest `reset --merge` in How Merge... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-24 | Documentation: merge: move configuration section to end Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-10 | Documentation: tiny git config manual tweaks Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-10 | Documentation: git gc packs refs by default now Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-10 | Documentation: tiny git config manual tweaks Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-10 | Documentation: git gc packs refs by default now Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-07 | git-gui: Makefile: consolidate .FORCE-* targets Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-06 | Makefile: consolidate .FORCE-* targets Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-06 | Makefile: learn to generate listings for targets requiring... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-06 | Makefile: use target-specific variable to pass flags... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-06 | Makefile: regenerate assembler listings when asked Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-06 | Makefile: make ppc/sha1ppc.o depend on GIT-CFLAGS Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-28 | Makefile: do not clean arm directory Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-18 | Speed up bash completion loading Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-13 | Provide a build time default-editor setting Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-13 | am -i, git-svn: use "git var GIT_PAGER" Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-13 | add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR" Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-13 | Teach git var about GIT_PAGER Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-13 | Teach git var about GIT_EDITOR Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-13 | Suppress warnings from "git var -l" Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-13 | Do not use VISUAL editor on dumb terminals Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | diff --no-index: make the usage string less scary Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | merge-{recursive,subtree}: use usagef() to print usage Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Introduce usagef() that takes a printf-style format Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Let 'git <command> -h' show usage without a git dir Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Show usage string for 'git http-push -h' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Let 'git http-fetch -h' show usage outside any git... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Show usage string for 'git stripspace -h' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Show usage string for 'git unpack-file -h' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Show usage string for 'git show-index -h' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Show usage string for 'git rev-parse -h' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Show usage string for 'git merge-one-file -h' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Show usage string for 'git mailsplit -h' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Show usage string for 'git imap-send -h' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Show usage string for 'git get-tar-commit-id -h' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Show usage string for 'git fast-import -h' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Show usage string for 'git check-ref-format -h' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | http-fetch: add missing initialization of argv0_path Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | merge: do not setup worktree twice Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | check-ref-format: update usage string Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Show usage string for 'git show-ref -h' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Show usage string for 'git merge-ours -h' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Show usage string for 'git commit-tree -h' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Show usage string for 'git cherry -h' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Show usage string for 'git grep -h' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-10 | Retire fetch--tool helper to contrib/examples Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-11-09 | Add intermediate build products to .gitignore Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-10-31 | Handle more shell metacharacters in editor names Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-10-30 | clone: detect extra arguments Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-10-13 | check-ref-format: simplify --print implementation Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-10-12 | Documentation: describe check-ref-format --branch Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2009-10-12 | Add tests for git check-ref-format Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |