aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jc/am'Junio C Hamano2008-03-08
|\
| * am: --rebasingJunio C Hamano2008-03-05
| * am: remove support for -d .dotestJunio C Hamano2008-03-05
| * am: read from the right mailbox when started from a subdirectoryJunio C Hamano2008-03-05
* | Merge branch 'cr/reset-parseopt'Junio C Hamano2008-03-08
|\ \
| * | Make builtin-reset.c use parse_options.Carlos Rica2008-03-05
* | | Merge branch 'jn/gitweb-pickaxe'Junio C Hamano2008-03-08
|\ \ \
| * | | gitweb: Fix and simplify pickaxe searchJakub Narebski2008-03-05
| |/ /
* | | Merge branch 'kb/maint-filter-branch-disappear'Junio C Hamano2008-03-08
|\ \ \
| * | | filter-branch: handle "disappearing tree" case correctly in subdir filterJunio C Hamano2008-03-08
* | | | Merge branch 'maint' to sync with 1.5.4.4Junio C Hamano2008-03-08
|\ \ \ \
| * | | | GIT 1.5.4.4v1.5.4.4Junio C Hamano2008-03-08
| * | | | ident.c: reword error message when the user name cannot be determinedSanti Béjar2008-03-08
| * | | | Fix dcommit, rebase when rewriteRoot is in useJohn Goerzen2008-03-08
| * | | | Really make the LF after reset in fast-import optionalAdeodato Simó2008-03-08
| * | | | Merge branch 'mh/maint-http-proxy-fix' into maintJunio C Hamano2008-03-08
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/maint-daemon' into maintJunio C Hamano2008-03-08
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'js/maint-cvsexport' into maintJunio C Hamano2008-03-08
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/maint-log-merge-left-right' into maintJunio C Hamano2008-03-08
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ew/maint-svn-cert-fileprovider' into maintJunio C Hamano2008-03-08
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | merge-tool documentation: describe custom command usageCharles Bailey2008-03-08
* | | | | | | | | git-mergetool documentaiton: show toolnames in typewriter fontCharles Bailey2008-03-08
* | | | | | | | | Merge branch 'aw/maint-shortlog-blank-lines'Junio C Hamano2008-03-08
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | shortlog: take the first populated line of the descriptionAndy Whitcroft2008-03-05
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2008-03-07
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | unquote_c_style: fix off-by-one.Pierre Habouzit2008-03-07
| * | | | | | | | | test-lib: fix TERM to dumb for test repeatabilityJunio C Hamano2008-03-07
| * | | | | | | | | config.txt: refer to --upload-pack and --receive-pack instead of --execUwe Kleine-König2008-03-07
| * | | | | | | | | Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano2008-03-06
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl failsShawn O. Pearce2008-03-05
* | | | | | | | | | send-email: --no-signed-off-cc should suppress 'sob' ccJunio C Hamano2008-03-07
* | | | | | | | | | Merge branch 'js/reflog-delete'Junio C Hamano2008-03-07
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t3903-stash.sh: Add tests for new stash commands drop and popBrandon Casey2008-03-03
| * | | | | | | | | | git-reflog.txt: Document new commands --updateref and --rewriteBrandon Casey2008-03-03
| * | | | | | | | | | t3903-stash.sh: Add missing '&&' to body of testcaseBrandon Casey2008-03-03
| * | | | | | | | | | Merge commit '74359821' into js/reflog-deleteJunio C Hamano2008-03-03
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-stash: add new 'pop' subcommandBrandon Casey2008-02-22
| * | | | | | | | | | | git-stash: add new 'drop' subcommandBrandon Casey2008-02-22
| * | | | | | | | | | | git-reflog: add option --updateref to write the last reflog sha1 into the refBrandon Casey2008-02-22
| * | | | | | | | | | | refs.c: make close_ref() and commit_ref() non-staticBrandon Casey2008-02-22
| * | | | | | | | | | | git-reflog: add option --rewrite to update reflog entries while expiringBrandon Casey2008-02-22
| * | | | | | | | | | | reflog-delete: parse standard reflog optionsBrandon Casey2008-02-22
| * | | | | | | | | | | Merge branch 'bc/reflog-fix' into js/reflog-deleteJunio C Hamano2008-02-22
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | builtin-reflog.c: fix typo that accesses an unset variableBrandon Casey2008-01-04
| * | | | | | | | | | | | Teach "git reflog" a subcommand to delete single entriesJohannes Schindelin2007-10-17
* | | | | | | | | | | | | Merge branch 'dc/format-pretty'Junio C Hamano2008-03-07
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | log/show/whatchanged: introduce format.pretty configurationDenis Cheng2008-03-05
| * | | | | | | | | | | | | specify explicit "--pretty=medium" with `git log/show/whatchanged`Denis Cheng2008-03-05
| * | | | | | | | | | | | | whatchanged documentation: share description of --pretty with othersDenis Cheng2008-03-05
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'cb/mergetool'Junio C Hamano2008-03-07
|\ \ \ \ \ \ \ \ \ \ \ \ \